Enhanced diagnostic workup